Cronet: set clang_use_default_sample_profile via GN arg declaration At the time clang_use_default_sample_profile was introduced, there was no GN arg to define whether Cronet was being built. Now that this exists it's preferable to rely on that instead of override. Additionally, now that we have dropped all GN arg overrides for Cronet bots (expect for is_cronet_build), make it clear that no new overrides should ever be added. Bug: 40287068 Change-Id: Icddc5a5edd1f2743d33e3db0d1012cffdf9fdd74 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6964624 Reviewed-by: Ben Pastene <bpastene@chromium.org> Commit-Queue: Stefano Duo <stefanoduo@google.com> Reviewed-by: Etienne Dechamps <edechamps@google.com> Reviewed-by: Andrew Grieve <agrieve@chromium.org> Cr-Commit-Position: refs/heads/main@{#1517940} NOKEYCHECK=True GitOrigin-RevId: f75f73e29564944dd1b2df4d5a8258779463cf4e diff --git a/mb_config.pyl b/mb_config.pyl index 108a4b1..0bfd562 100644 --- a/mb_config.pyl +++ b/mb_config.pyl
@@ -837,19 +837,20 @@ 'gn_args': 'ios_code_signing_identity_description="Apple Development: Google Development"', }, - # Keep in sync with //infra/build/recipes/recipe_modules/chromium_android/chromium_config.py 'cronet_android': { 'mixins': ['cronet_common'], - # LINT.IfChange(cronet_android) - 'gn_args': ('clang_use_default_sample_profile=false '), - # LINT.ThenChange(//infra/config/gn_args/gn_args.star:cronet_android) + # DO NOT ADD GN ARGS HERE. Special snowflake gn args are a pain to + # maintain; see https://crbug.com/40287068. Instead, change the GN arg + # declaration so that the default value for the arg is derived from the + # `is_cronet_build` GN arg. }, - # Keep in sync with //infra/build/recipes/recipe_modules/chromium_android/chromium_config.py 'cronet_common': { - # LINT.IfChange(cronet_common) + # DO NOT ADD GN ARGS HERE. Special snowflake gn args are a pain to + # maintain; see https://crbug.com/40287068. Instead, change the GN arg + # declaration so that the default value for the arg is derived from the + # `is_cronet_build` GN arg. 'gn_args': ('is_cronet_build=true ') - # LINT.ThenChange(//infra/config/gn_args/gn_args.star:cronet_common) }, 'custom_args': { diff --git a/mb_config_expectations/chromium.infra.codesearch.json b/mb_config_expectations/chromium.infra.codesearch.json index 99f4908..4cfe2c7 100644 --- a/mb_config_expectations/chromium.infra.codesearch.json +++ b/mb_config_expectations/chromium.infra.codesearch.json
@@ -36,7 +36,6 @@ "android_static_analysis": "off", "arm_use_neon": false, "clang_use_chrome_plugins": false, - "clang_use_default_sample_profile": false, "debuggable_apks": false, "enable_kythe_annotations": true, "is_clang": true,
